Beging moving application actions to top-level QMenu.

diff --git a/gui/main.cpp b/gui/main.cpp
index 122e34f317c2678a23adda85d535146f51f622d4..79977304a4a95fbcd8ada2d590766511e5c430df 100644 (file)
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id: main.cpp,v 1.1 2009/07/05 21:14:56 robertl Exp $
+// $Id: main.cpp,v 1.2 2009/07/20 02:30:42 robertl Exp $
 //------------------------------------------------------------------------
 //
 //  Copyright (C) 2009  S. Khai Mong <khai@mangrai.com>.
@@ -64,7 +64,7 @@ int main(int argc, char**argv)
   installTranslation(app, "gpsbabelfe_");
   installTranslation(app, "gpsbabel_");
   
-  QCoreApplication::setOrganizationName("GpsBabel");
+  QCoreApplication::setOrganizationName("GPSBabel");
   QCoreApplication::setOrganizationDomain("gpsbabel.org");
   QCoreApplication::setApplicationName("GPSBabelFE");
 

diff --git a/gui/mainui.ui b/gui/mainui.ui
index cd24b1adea105dd110be528a70540ba870ddfb63..5bbf999a51b4a0a7f5a467ef786160c5708ad195 100644 (file)
--- a/gui/mainui.ui
+++ b/gui/mainui.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>GpsBabel</string>
+   <string>GPSBabel</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
@@ -655,9 +655,100 @@
     </widget>
    </item>
   </layout>
+  <widget class="QWidget" name="centralwidget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>100</width>
+     <height>30</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>22</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuHello">
+    <property name="title">
+     <string>GPSBabel</string>
+    </property>
+    <addaction name="actionAbout"/>
+    <addaction name="separator"/>
+    <addaction name="actionPreferences"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionGPSBabel_Help"/>
+   </widget>
+   <addaction name="menuHello"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <action name="actionGPSBabel_Help">
+   <property name="text">
+    <string>GPSBabel Help</string>
+   </property>
+  </action>
+  <action name="actionPreferences">
+   <property name="text">
+    <string>Preferences</string>
+   </property>
+  </action>
+  <action name="actionQuit">
+   <property name="text">
+    <string>Quit</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About GPSBabel</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="app.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>actionGPSBabel_Help</sender>
+   <signal>activated()</signal>
+   <receiver>MainDlg</receiver>
+   <slot>helpClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>336</x>
+     <y>293</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAbout</sender>
+   <signal>activated()</signal>
+   <receiver>MainDlg</receiver>
+   <slot>aboutClicked()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>336</x>
+     <y>293</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>